Merge "Reprioritize AOD battery info" into sc-qpr1-dev