Merge "Refactor Power Management"