Merge "Improve the reboot-to-recovery dialogs"