CL also includes a few minor UI fixes to match mocks and a11y.

Bug: 832933
Change-Id: Ibb9fd594b80d79692593e65f00636fbd7115eb3e
Reviewed-on: https://chromium-review.googlesource.com/1212265
Commit-Queue: Hector Carmona <hcarmona@chromium.org>
Reviewed-by: Scott Chen <scottchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590165}