Merge "Stop setting crazy Z value with controls (at the moment depth is ignored by...