Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev