Merge "Fix UI flashing after changing network mode" into main