Merge "Add icons to Manage location services and App location permissions" into sc-dev