Merge "Draw status bar battery icon bolt in code." into klp-dev