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

Change-Id: Idd5da9a0e33a2841eab04a357a0fe21278109963