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

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