Merge "Makes current user not clickable" into qt-qpr1-dev
am: 32acc3e3bb

Change-Id: Ib8f55645e64c6568a961662e297f123c1eb47d4a