Merge "Enable the settings_controller_loading_enhancement" into rvc-dev am: 8011ca61 am: 89e150d8 am: ade42d71 Change-Id: I42f3005cba4158a3e825e73fa5e98f88ed1d28d8