Merge "sdm: Reduce scope of lock in deinit"