Merge "Make emergency notification dismissable" into qt-qpr1-dev