Merge "[Manual Network Selection] UX improvement"