f97ed77197
* commit 'd90a2c4d4463085155444efb07eba2d6579b444a': DO NOT MERGE. Integrate from master: Rework display size access.