Merge "Don't show Wi-Fi indicator until it is validated"