Merge "Fix battery icon dark initialization" into oc-dev
am: cb4ed821f2

Change-Id: I34cc7adb16ec21ba8c9cf210b3ca61b2c9506290