Merge "Make VV2 & MCV2 extend ViewGroup"