Merge "Fix falsing on notification dismissal." into tm-qpr-dev