Merge "Leanback: Add onGuidedActionCanceled" into nyc-dev