Merge "sdm: disable safe mode on successful commit"