Merge "Clarify documentation of Display#getSize()" into nyc-mr1-dev