Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev