Merge "Replace magic 0 with enum in surfacecontrol"