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

Change-Id: Ic5c9be66304c6795b69f3f93251d8b22a300e648