Merge "Fix Battery page animation"