Merge "Fix extra onStop when finishing after onCreate" into qt-dev