Merge "Controls - UX spacing tweaks" into sc-dev