Merge "Unlock should always wait for pending PRE_BOOT." into nyc-dev