Merge "Resolve size compatibility bounds by original display attributes" into qt-dev