Merge "init: Prevent spin loop while waiting for exec or property"