Merge "[5/n] Camera Compat UI: Unify margins logic for camera and size compat controls." into sc-v2-dev