Merge "Update dark theme battery info error text color" into sc-dev