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