Merge "Make emergency notification dismissable" into qt-qpr1-dev am: 0934fee1ef

Change-Id: Ia4346258cada298e9dac764c024758ce25420392