Merge "Fix Battery page animation" into qt-qpr1-dev
am: 8b348f1f30

Change-Id: I922be1ac21e17c9ae71d7721401a08bbd56ca020