Merge "Add/plumb SurfaceControl.DISPLAY_DECORATION"