Merge "Fix 6683092: tune GlowPadView wave animation" into jb-dev