Merge "Don't wake users up with low battery sounds." into klp-dev