Merge "[Network Connection] Implement new UI changing"