am 74cb705f: Merge change 8121 into donut

Merge commit '74cb705f0c1ee5ccb598b2b676aa50a36e6af7f9'

* commit '74cb705f0c1ee5ccb598b2b676aa50a36e6af7f9':
  Fixes #1818201. Do not attempt to display the popup until after the first layout.