Merge "Fix Cursor leak in SettingsBackupAgent. Bug: 5434060"