Merge "Don't log userspace_reboot.started/finished properties from init"