Merge "Add null check to batterymeterview in case the percent view becomes null" into sc-dev