Merge "Clean up bootloader_message usage in recovery"