Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev