Merge "Fix popup context menu appearing brokenly." into nyc-dev