Merge "Save preferred activity info with user id." into jb-mr1-dev