Merge "System status event animation polish (1/n)" into tm-dev