Merge "Revert enabling common-service for setting info." into devel_3.0_main