Merge "Use grey icon for work profile settings" into pi-dev