Merge "Save overlay paths as user state" into oc-dev