Merge "Add Color Layer to ASurfaceControl"