Merge "Use adjusted popup window position when calculating best-fit" into nyc-dev
am: 0529197

* commit '0529197e9df8837ac63b011937391ff29426e6b5':
  Use adjusted popup window position when calculating best-fit

Change-Id: Ib6688f23f3bf86519fcada8c274c2e2462e8d201