Merge "Clean up NotifCollection logging slightly." into tm-qpr-dev