Merge "Respect user restrictions about adding/removing accounts, sideloading" into jb-mr2-dev