am 85aea366: Merge "Remove Popup immediately rather than defer it." into jb-dev

* commit '85aea3664992cd1e16ef4497c3450b26bdef06b0':
  Remove Popup immediately rather than defer it.