Merge "Make notif text more generic" into tm-qpr-dev