Merge "leanback: workaround VideoView forcing focus problem" into nyc-mr1-dev