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

* commit 'c18e4a926530cf458bdc67abfdd60488ff62d758':
  Fix bug where cancelling config activity leaves user stuck in bad state