Merge "Make the default user the current user (not 0)" into qt-qpr1-dev
am: a7bdb8ba0b

Change-Id: Iea445966a2da3fa8d03e252f0a78290ecaf68199