Merge "Handle an edge case that can reset settings provider data" into oc-dr1-dev