Merge "[pm] fix a system crash caused by cleanUpUser" into main