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

Change-Id: I796e63264ddbba810a1def709594fa73977f50ca