Merge "Fix issue with PiP menu activity disallowing touches" into oc-mr1-dev