Merge "Stop network scan before manual select network" into main