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