Merge "[BUGFIX][ZXW-223][AUTOSUSPEND]fix delete lock but not unlock"