Merge "Migrate dark theme settings" into rvc-dev