Merge "Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev am: 11e215bc45 am: 74aac8d9da" into nyc-mr1-dev-plus-aosp
am: 57fe0d1b08

* commit '57fe0d1b08abdae2f23529841622e0496984194c':
  Clear state when ProgressMessageCtrl. is canceled

Change-Id: I1c9fd5e1f4b01fddec6f8e3a042bb6398d6f0944