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

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