Merge "Don't constrain invalidation rect when not clipping children"