Merge "Remove mention of a defunct hidden setting" into main