Merge "[pm] revert lock changes to settings write" into main