Merge "Improve the reboot-to-recovery dialogs" into mnc-dev