Merge "Postpone the shared user checking after Q" into qt-dev am: 3f124d6463
am: ceaa7d45d2

Change-Id: I9af39e49b4b06afdd31a9580eb518d06514031fd