Merge "Revert LockIcon click behavior" into qt-dev
am: 0ba00953e0

Change-Id: Id858d8faf5e32a267a981cafc14d7b399879baa5