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

Change-Id: Ie796320c0dad775a19fd16e8ccebc1685cf72533