Merge "Split User settings into limited and trusted." into jb-mr2-dev