am efbd5db6: am cc29d3c1: Prevent toolbar from grabbing focus via keyboard

* commit 'efbd5db62ae55dd5f5af23b358b230175d883f4e':
  Prevent toolbar from grabbing focus via keyboard