Merge "Ensure we show the PiP menu in response to KEYCODE_WINDOW." into oc-dev