Merge "Unsubscribe listeners when stopping UserBackupManagerService and remove unused code"