Merge "Launch account addition activity from Settings instead of from AccountManager" into jb-mr1-dev