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