Merge "Stop setting crazy Z value when SetSize(width,height) is used" into devel...