Merge "Fix Leanback NPE: Add getConstantState().newDrawable() support"