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