Merge "Change "Advanced battery usage" to "Battery usage"" into pi-dev