Merge "Unsaved carrier wifi connection should display carrier in summary" into qt-dev am: 3d87a9920e am: 287662e2a2
am: d4bee4c5c2

Change-Id: I35c4482e8b3eb87fd2cca53ae4d1e6506d559a2a