Merge "Fix bug in initializing preferred activities." into jb-mr2-dev