Merge "Remove persistentPreferrredActivity policy on activity removal" into udc-dev