am d120e994: am c18e4a92: Merge "Fix bug where cancelling config activity...
am d120e994: am c18e4a92: Merge "Fix bug where cancelling config activity leaves user stuck in bad state" into jb-ub-now-jetsonic
* commit 'd120e994':
Fix bug where cancelling config activity leaves user stuck in bad state