unmerge: fix lock/UnsupportedAPIException logic
1 file changed