Merge "Fix restore from higher SDKs in SettingsBackupAgent" into pi-dev