Merge "leanback: fix choppy main fragment switching" into nyc-dev