Merge "Workaround for input ANR, always finish PiP menu activity." into oc-dev