Merge "Fix issue #8470131: Process thrash kills battery" into jb-mr2-dev