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

Change-Id: Id2d44a418a58eb3b1456d81f03fe2f8fe28685e2