Merge "AOD: Do not animate notification icons while dozing" into oc-dr1-dev