Merge "SF: Add a lock guard to mLayerHistory"