Merge "Ensure lottie animations are not empty." into tm-dev