Merge "Fix race condition between carrier changes and suggestion adding" into sc-dev