Merge "Fix CTS: ViewGroupTests failing" into mnc-dev