Merge "Revert vector drawables for menu icons" into nyc-dev