Merge "Revert "Block focus with a touchscreen for ActionBars and Toolbars"" into lmp-dev