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

Change-Id: I58c3b9a2d90028b0fae8064b10b82f0822482b98