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

Change-Id: Ief1216c3c4da9bca7151ee25db7e2e9d5a5e679d