am ebb56d9b: am 550f1d4e: Merge "Delete overscan setting by both unique id and name." into cw-d-mr1-dev

* commit 'ebb56d9b0c1567947ba2f98402a43920d9ba7ac0':
  Delete overscan setting by both unique id and name.