Merge "Bug #6110465. Optical bounds support for all ViewGroup subclasses."