Merge "remount: Improve messaging when a reboot is needed."