Merge "Use theme colors in battery stats widget" into mnc-dev