Merge "Replace invalidateChild/invalidateChildInParent"