Merge "Leanback: Accessiblity navigation fix" into mnc-ub-dev