Merge "Introduced AppRestrictionsLock" into oc-mr1-dev