Merge "Keep the PIP at the shifted position when the Settings is shown" into...
Merge "Keep the PIP at the shifted position when the Settings is shown" into nyc-mr1-dev am: e70f79b5 am: f3da8144
am: b8ff6a61
Change-Id: I355f246cb386e63c6c74fad0ebc508a7add66d8d