Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev
am: 11e215bc45

* commit '11e215bc45de37102977462c9ced878c130ff74a':
  Clear state when ProgressMessageCtrl. is canceled

Change-Id: If2f257fbc8aac0c04c4e71e5215870ef613a730b