Merge "Enable the settings_controller_loading_enhancement" into rvc-dev