Merge "Add new dpm api to disable user control over apps"