Merge "init: wait_for_prop shouldn't run in a subcontext"