am cfa9a98e: Merge "Improve the reboot-to-recovery dialogs"

* commit 'cfa9a98e99286e3cf1f89f80b37a5a9ff37c30c3':
  Improve the reboot-to-recovery dialogs