Merge "Rename Tab.LockIcon to Tab.SecurityState"