Merge "Rename LOCK_STATE_ALWAYS_LOCKED to LOCK_STATE_DEFAULT"