Merge "Added format to WindowlessWindowManager SurfaceControls"