Merge "Fix deadlock between DPMS and AMS" into main