Merge "Toward regularizing color & level across battery indicators." into klp-dev