Merge "Properly handle cancel event in GlowPadView" into jb-mr1-dev