Replace "choose mode" screen

Also augmented the description a bit.

Change-Id: I75b2043482b2876d2676ef59d7a19fe0213c3844
Merge "Replace "choose mode" screen"