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

Change-Id: I0e7ebad537d96bbe33de984f9bfb3519cf2085f0