Merge "Move message ids to BackupHandler."