Merge "Fix crash of Connected Devices page"