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

Change-Id: Ia96b93b4e344b9ae4118099943d60cfd43114d0f