Merge "DO NOT MERGE Don't re-animate duplicate biometric msgs" into tm-dev