Merge "Fix deadlock between PMS and AMS" into main