Merge "Don't invalidate layout on detach" into nyc-dev