Merge "Revert "RESTRICT AUTOMERGE Finalizing Q resources"" into qt-dev