Merge "Move the battery LED code over to the battery service from the notification service (!)"