Merge "Revert "Fast-path for ViewGroup#invalidateChild, invalidate tests""