Merge "Clean up flag fix_crash_on_getting_config_when_phone_is_gone" into main