Merge "Fix Battery page animation" into qt-qpr1-dev