[automerger skipped] Merge "Fix Battery page animation" into qt-qpr1-dev am: 8b348f1f30
am: 5d0c49e9ef -s ours
am skip reason: change_id I167ac87c9bd83035e00d4991961599e76f4f69e1 with SHA1 648ada031d is in history

Change-Id: Ibbc4555497debc8b6280e6e2c1e4ca4da30c6437