Merge "Double tap to expand PiP." into oc-mr1-dev
am: 2a6f25b995

Change-Id: I75a3dd9befd6bb1bb2aefb11ea1239ea22072e0f