Perform saving when adding new subscriptions atomically

Change-Id: I8e6dcfa02f319fd0ea104f1e0ceccab64540b55f