am 8cb10bd8: Merge "Application restrictions UI" into jb-mr2-dev

* commit '8cb10bd8fc59ce510ae015e8280f99383cddf9c5':
  Application restrictions UI