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

Change-Id: Ibfece3b6c7ac54974f16369e5c1e37f17986f89e