Merge "Subtle improvements to notification logging." into tm-qpr-dev