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