Merge "Opt-in Settings package to see restricted accounts" into jb-mr2-dev