Merge "Prevent dismissing starting window when reopening app" into qt-dev
am: 94f7f39a01

Change-Id: I32e45a228f4249a06e0fa93667a47bc95e3878b2