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

* commit '66287788d35687a140df10ac96646cdf04f91a88':
  Avoid drawing the starting window twice