Merge "Read battery and icon colors from theme" into sc-dev