Merge "Keep the PIP at the shifted position when the Settings is shown" into nyc-mr1-dev