Merge "Fix issue with double tapping PiP" into oc-dev
am: 33d95164ab

Change-Id: I34edd358a3d44e58fbf80661d14d541fcb275de2