Merge "Move the account picker class name to a config resource." into jb-mr2-dev