Fix highlight state getting stuck on after menus close

BUG=919057,916410,934213
R=mohsen

Change-Id: If60bc5958d07fec526b04493f80cb47570b9d00a
Reviewed-on: https://chromium-review.googlesource.com/c/1432880
Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#636713}
4 files changed