Merge branch 'pm-domains' into pm

* pm-domains:
  PM / Domains: Avoid a potential deadlock