Merge "Replace the "coldboot" timeout with a property."