Merge "Fix lock contention: Call into power manager service from handler" into oc-dev