am 326c443e: am 66287788: Merge "Avoid drawing the starting window twice" into lmp-dev

* commit '326c443e1bed7d0bd711ebfeb7f5c0003d534281':
  Avoid drawing the starting window twice