Merge "art_quick_unlock_object uses comparison incorrectly"