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

Change-Id: Icfb5e2501589f2b100abe46f90033966deaa0c49