Track correct packages_apps_Settings branch