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

Change-Id: Ie514c22821ef4dc82ea758608172a56f92caf8e7