Merge "Fixed some a11y issues in MainActivity." am: 1d9fccf02f
am: b07c4e720b

Change-Id: I8cd7599a27b7bed4b03551295466f9311484d001