Fixes to mount state.

Fixing a bug when mounting using the UUID but the device is mounted using the actual device.  Results in an attempt to umount and remount. #18613