Merge "Fix flickers when changing control" into rvc-dev