Merge "Fix missing notifs after swipe" into tm-qpr-dev