Merge "Fix Icon usage of local overlay in Wi-Fi"