Merge "Several improvements and fixes in restrictions UI" into jb-mr2-dev