Merge "Application restrictions API" into jb-mr2-dev