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