Merge "UiMode TwilightManager null" into rvc-dev