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

Change-Id: I54ce7800fa6c7ff9da7b184fa3a06235fb88a872