Merge "MountService: If USB cable is unplugged while UMS is active, clean up and remount"