Merge "Revert "[automerger skipped] Merge "DO NOT MERGE - Kill apps out..."" into qt-qpr1-dev