Merge "MountService: Check for failure to unmount when enabling UMS and fix reversed logic"