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

Change-Id: I722e88756c576acca7419d53738d5883bf864260