Merge "Make Toolbars eat touch events" into lmp-dev