am daed490c: am e276cbe5: Merge "Make the country list longer enough for scrolling when device is in portrait mode"

* commit 'daed490c7087e822db630a9f80ecceccf5de0b88':
  Make the country list longer enough for scrolling when device is in portrait mode