Merge "Catch null handler in PlayerViewHolder.marquee."