Merge "Migrate mount/umount operations to a dedicated mMountsLock."