AI 148485: Clean up the scrollview layout so the button bar is always on the
  bottom of the screen.
  Also removed an extra ':' in a string on the screen (none of the other
  label strings have ':').
  BUG=1740626

Automated import of CL 148485
1 file changed