Merge "Allow merging of resources with the same overlayable" into qt-dev