Merge "Clear state when ProgressMessageCtrl. is canceled" into nyc-dev