Merge "Use -1.0f in SurfaceControl to turn off brightness"