Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev