Merge "Immediately stop HBM & authRipple anim onAcquire" into tm-dev