Merge "Add a lock around mBuffer in Archive." into sc-dev