Merge "Fix shifting problem in location services page" into sc-dev