Merge "Minor tweaks to UserspaceRebootLogger"