Merge "Put grammatical gender developer option behind flag" into main