Merge "Do not execute app transition too early" into qt-dev