Merge "Show waiting for boot failure when boot actually fails."