Merge "VideoView2: Remove redundant listeners"