Merge "Fix race condition updating local map data."