Merge "Improve Wi-Fi Easy Connect lock screen UI information"