Merge "Correctly implement multi-user theming support"