Merge commit '48d4f673001160df8feae3185a603f320c000e1b' * commit '48d4f673001160df8feae3185a603f320c000e1b': Adjust the character picker layout a little so it will fit on the screen.
Merge commit '48d4f673001160df8feae3185a603f320c000e1b' * commit '48d4f673001160df8feae3185a603f320c000e1b': Adjust the character picker layout a little so it will fit on the screen.