Merge "Don't restart non-system DataLoaders on reboot." into rvc-dev