Merge "Revert "Don't copy null surface control and remove lingering references to leashes"" into tm-qpr-dev