Merge "Cleans up sharedUser regardless of creation logic" into qt-dev
am: a1bf282e43

Change-Id: Ic721f31332bbcbb9d64e501b3b94b6b457c8af51