Merge "Revert "PIP: Use long press HOME for PIP on Android TV (2/2)"" into nyc-dev