Merge "Revert "Add animation for battery asyncLoader."" into oc-dev