Merge \"Clarify docs for PopupWindow width/height parameters\" into nyc-dev
am: 22f887a014

Change-Id: I84d345cde0d16e98ce3fefa703929f243a5fdced