Merge "PIP: Apply the latest UI spec for PIP menu" into nyc-dev