Merge "Dark theme not turning on/off when in twilight mode" into rvc-dev