Merge "Fixed guest check so it allows multiple pre-created users." into qt-qpr1-dev
am: d505667f65

Change-Id: Ic1d6da6007f32870f75b1b70a59b45cac6ff2a2b