Merge "Button should not propagate handled touch events" into devel/master