Merge "Remove use of private api ViewGroup.setChildrenLayersEnabled"