Merge "Fix ControlsProviderLifecycleManagerTest" into rvc-dev