Merge "Unify logic for resetting properties before userspace reboot"