Merge "Refactor storage & notification flow for prod" into sc-dev