Merge "Revert "Add/plumb SurfaceControl.DISPLAY_DECORATION""