Merge "Do not sample more child Views than available in the ViewGroup being tested" into oc-dev