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

Change-Id: I3c1f731fea42092ab93d3736bf85553bae2d1d41