Merge "Modify the Manual-selct UI according to Phase 3 UX review." into pi-dev am: 35207e6363
am: f4d9fd37ea

Change-Id: I8f6d455a8a83e52853bec7764c9732f2a7358626