Merge "Fix deadlock between DPMS and AMS" into udc-qpr-dev