Merge "Fix tint of battery icon" into udc-qpr-dev