Merge "Prevent invisible PiP menu activity from having touch focus." into oc-dev