Merge "On notification update, take the newest value of shouldHeadsUp" into tm-qpr-dev