am 733deb26: Merge "Make the recovery menus wrap."

* commit '733deb267db3488be408cbe020769108ee6584b0':
  Make the recovery menus wrap.