Merge "Allow non-system apps to use restricted accounts" into jb-mr2-dev