Merge "Fix deadlock in MountService"