Merge "Cleaned up the flag backup_and_restore_for_enable_2g" into main