Merge "Fix power manager issues." into jb-dev