Merge "init: add wait_for_prop builtin command"