Merge "MountService: Force unmount when enabling ums"