Merge "Resolve size compatibility bounds by original display attributes" into qt-dev am: 7c94df4903
am: 57805e1a6e

Change-Id: I38e444d2a9ae7c9347aead9385bbd3de5e66cab6