Merge "Introduce LocalBackupPasswordPreferenceController"