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

Change-Id: I1750527e65636e8300c9e89a701c6d78d3eb8171