Merge "Remove hardcoding of system user" into qt-dev