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

Change-Id: Iadb65f5b0eded93a30402233509956a67a799330