Merge "Do not apply System User restrictions for non-headless builds" into qt-dev