Merge "Remove outdated comment in ElementContentPicker" into main