Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev