Merge "Update battery error layout" into sc-dev