Merge "Merge "AOD: Fix janky pulse out animation" into oc-dr1-dev am: d72954af31" into oc-mr1-dev