Merge "Fix app transition delayed cases" into qt-dev