Merge "Remove device ownership text in quick settings" into sc-dev