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

Change-Id: Iaff4d5d9c341f2c14a2c19eaf0675e17ce8d5a0e