Merge "Do not animate icons when leaving AoD" into oc-mr1-dev