Merge "Delete overscan setting by both unique id and name." into cw-d-mr1-dev