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

Change-Id: Iefe597271e07e53a9a9b879d62690acbc4fef8cc