Merge "Fix Wi-Fi Easy Connect buttons UI defects"