Merge "PIP: Move PIP to left when Settings is visible" into nyc-dev