Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev