Merge "SurfaceControl: Add setDropInputMode api"