Merge "Revert "Flip default value of headless user 0 flag."" into qt-dev
am: a4b089bd10

Change-Id: I4d5f8f6e273bdf2d44616e321a817b290ce21578