Merge "Report non-empty system boot reason when bootloader reason is empty"