Merge "Adding UiModeManager Custom Tests" into rvc-dev