Merge "Revert "Allow SUW to change dark theme"" into rvc-dev