Merge "Fix the bug of losing Wi-Fi certificate when editing"