Merge "Don't update preference list when there's no Activity for it."