Merge "Fix missing lock in power manager."