Merge "PIP: Restore PIP size when PIP menu is gone" into nyc-dev