Merge branch 'battery-notif' into sandbox