Merge "Fix, MountService now only sends one onShutDownComplete"