Merge "Always use existing PopupWindow dimension if not otherwise specified" into nyc-dev
am: 11c0415

* commit '11c041576d3d3ea2059387ac7be89c561467b0ef':
  Always use existing PopupWindow dimension if not otherwise specified

Change-Id: Id3a4f82e97a1f2e770340fcde2c7010159230bf9