Merge commit 'cd7574014c874d2bc75be8a3f3c1bab862205999' * commit 'cd7574014c874d2bc75be8a3f3c1bab862205999': Keep track of 'initial' sync state in SyncStatusInfo
Merge commit 'cd7574014c874d2bc75be8a3f3c1bab862205999' * commit 'cd7574014c874d2bc75be8a3f3c1bab862205999': Keep track of 'initial' sync state in SyncStatusInfo