Merge "init: prevent waiting forever when a setprop is incomplete." into klp-volantis-dev