Merge \"Clarify documentation of Display#getSize()\" into nyc-mr1-dev
am: 5552dc341f

Change-Id: I6d43f9c0a572307c3e45462e571a319f78c63930