Merge "Revert changes to invalidateChild"