Merge "Don't check battery usage in excessive bg anomaly" into pi-dev