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

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