Merge "Fixed a bug where status icons were not animating" into oc-dr1-dev