Merge "QS Wifi panel show icon on secure networks" into lmp-mr1-dev