Merge "Reset dev.bootcomplete property during userspace reboot"