Merge "Dark theme upgrade broken" into rvc-dev