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

Change-Id: I838cbedf1388e8fcab56ecf824730b9ac871a738