Merge "Call removeMessages() only for certain operations in BackupManagerService#handleCancel()" into oc-dev