Merge "Fix notifications containing null entries in actions" into tm-qpr-dev