Merge "Clean up flag show_call_id_and_call_waiting_in_additional_settings_menu" into main