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