Merge "Battery usage page latency improvement (1-8)" into udc-qpr-dev