Merge "UserController.startUser nullchecks unlockListener" into qt-dev