[JENKINS-23428] Better support for ViewGroup