Merge "Revert "Change string of switchbar and installed service category title"" into qt-dev am: f508ece42d am: f8baacfe7f
am: d77b10c7de

Change-Id: I203137b6481999ca75be10996dac8a9e0fd4a71a