Merge "Fail early in RotationResolverService if camera lock is enabled" into sc-dev