Merge "Don't get struct of children of !laidout viewGroup" into oc-mr1-dev