Merge "Incorrect localization of dark theme custom time" into rvc-dev