Merge "[pm] properly nullify pkg when DELETE_KEEP_DATA" into main