Merge "Revert "init: Reworked how we wait for COLDBOOT_DONE""