Merge "DO NOT MERGE: Fix issue #129936402: Runtime restart occurs when suspending an app..." into qt-dev