Merge "Update comment about immutable overlay idmaps" into main