Merge change 5692 into donut

* changes:
  Adjust the character picker layout a little so it will fit on the screen.