Merge "Do not animate icons when leaving AoD" into oc-mr1-dev am: 06dc14cabc
am: a6e4a02b7e

Change-Id: I70ea8de8a19743859ca1226d7570db5fb1dfd03c