Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev