Merge "AOD animation polish" into pi-dev am: 704a0d6174
am: e9861964bf

Change-Id: I135ff3a852d2b1d2288add1c0c94bbf7313d1aec