Merge "Fix bug by allowing popup notifications to be dismissed via swipe" into tm-qpr-dev