Merge "Add power manager to critical bug section"