Merge "Jump ripples to end when switching to a non-hardware canvas" into lmp-mr1-dev