Merge "Initialize Display White Balance using SurfaceControl"