Merge "[CDM] retroactively add restored associations upon app installation" into main