Merge "Stop dreaming if the battery not charging effectively." into jb-mr1-dev