Merge "Revert LockIcon click behavior" into qt-dev