Merge "Rename the headless system user flag to under 32 chars." into qt-dev