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

Change-Id: Ib0c7423c21cd50ab3074357a20d13516c9b287a4