Merge "init: support wait timeout with more precision"