Merge "Add back HIGHLIGHT_MENU_KEY for DevelopmentSettings" into main