Merge "Fixed the video view crash in SupportLeanbackShowcase master build" into mnc-ub-dev