Merge "Fix RippleFinished being called on first draw." into tm-qpr-dev