Merge "Fix incorrect user id  when applying default preferred activity"