Merge "Move SurfaceControl Brightness calls into LocalDisplayAdapter"