Merge \"Fix popup context menu appearing brokenly.\" into nyc-dev
am: 29ea814354

Change-Id: I1fdc4c75bf763a3e0c1411230e5a0cdc21ad882a