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