Merge "Wifi usability: Add two leftover entries and a few tweaks"