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