Merge "Fix wifi tile animating full-dark when slashing/unslashing" into oc-mr1-dev am: 9b120d5a08
am: 01cc377d88

Change-Id: I4cf6284c9d13167c707820564e93a7684ae1bf92