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

Change-Id: I9156105dfbc66fb7fdd17ea3f41885ed2e4da8b0