Merge "Rework display size access."