Merge "Un-hide all ViewParent methods"