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

Change-Id: I28520a9bbdeb71fd4c407fcfe02f0309db63ba69