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

Change-Id: Ic5955dc9ffa1735ece55e1eeb36410d0b6acc380