Merge "Ensure colors for active permission icons" into pi-dev