Merge "Add lock icon click handler when a11y is enabled" into tm-dev