Merge "Correctly implement multi-user theming support" into sc-v2-dev