Merge "Isolate & fix animation logic for BP icon/overlay" into tm-qpr-dev