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

Change-Id: I31c58ac77e4df9e32958659519229467a82d2f08