Merge "Use a new lock for the app restriction level settings" into tm-dev