Merge "Merge "Postpone the shared user checking after Q" into qt-dev am: 3f124d64 am: ceaa7d45" into qt-r1-dev-plus-aosp