Merge "Fully disable SCM when users pick fullscreen in settings" into main