Merge changes I3d638a98,I55d18254

* changes:
  [RefactoredBMS] Add tracing for UserState and a few services
  [RefactoredBMS] Call removeMessages() only for certain operations in RefactoredBackupManagerService#handleCancel()