Merge "Fix extend unlock logic when locked"