Merge "Remove isAnimating check in assignRelativeLayerForIme" into tm-dev