Merge "Change the icon for the captive portal login app." into qt-dev