Merge "Make mIdsToViews thread safe."