Merge "Don't block intent if op is restricted due to toggles" into sc-dev