Merge "Use grey icon for work profile settings" into pi-dev am: d3bb3945bd
am: 5b5dfb94c4

Change-Id: Ifafc0ac9a7e9d957290d9158518a997e8dd51892