Merge "Adding simple test for PlayerViewHolder construction" into rvc-dev