Merge branch 'battery-sysfs-notifier' into release