Merge changes from topic "setModeNoLock"

* changes:
  Remove unnecessary internal APIs.
  SetMode: Don't call into PM with AppOps lock held