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

Change-Id: Ia43662f73405bf5ea563f6aba56556a40b327826