Merge "Fix icon spacing on both MenuPopup implementations." into nyc-dev