Merge "recovery: Fix the FIXME in get_menu_selection()."