Merge "Fixing issue with double tapping PiP." into oc-dev
am: 39d9ae20a6

Change-Id: Ibf0a355d5b171e360599620ce90aa7aee127e835