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

Change-Id: Ie93e3fa7a699b3e16070a1a5d09a7d094c472b7d