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

Change-Id: I1ea1b512c8518cc7fd7fc00de4a8a6c3157688b0