Merge "Fix menu popup rendering" into nyc-dev