Merge "Ensure colors for active permission icons" into pi-dev
am: 46d03c2914

Change-Id: I10b3e82a207d542a4761687c08927841eba09ba5