Merge "OMS: rebase settings when overlays update" into pi-dev
am: 203b7b1792

Change-Id: Icc4933994802079f96bc2b170d9167688b2939d9