am 7495273e: Merge "Two options on narrow; Three on wide" into jb-ub-mail-ur9

* commit '7495273e21e52d44aa23fcbd59c5a45998769c4f':
  Two options on narrow; Three on wide