Merge pin/bubble modifications from Reclaim Cities