Merge "Leanback: more improvement of FadeAndShortSlide" into mnc-ub-dev