automerge: 9ce34fd * commit '9ce34fd0a8335a18873d345eec675c177adbdd06': QS WiFi panel trigger settings on correct user