Merge "AOD: Fix LockIcon click handler" into oc-mr1-dev