Merge "Stopping setting identity-feature-enabled if Patrole"