Merge "Make some small fixes to sensor privacy ui" into sc-dev