* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62': DO NOT MERGE. Integrate from master: Rework display size access.