Merge change 8121 into donut

* changes:
  Fixes #1818201. Do not attempt to display the popup until after the first layout.