Merge "Change mODICaptionsTooltipView null check occasion to avoid potential crash"