Merge "[resolver] only keep one preferred activity if selected with always=true"