Merge "UX polish updates" into sc-dev