am fea784dd: Merge "Fix bug where dismiss() was being called from the wrong thread" into klp-dev

* commit 'fea784ddec162951e95e91010b25ffb65fe704db':
  Fix bug where dismiss() was being called from the wrong thread