Merge "Fix issue with PiP menu activity disallowing touches" into oc-mr1-dev am: 7affe01609
am: 98790fa7f0

Change-Id: I17b2d9acc375b188b2ffff688d5403600671096a