Merge "Disable combined controller only if all modalities require consent" into sc-v2-dev