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