Merge "Fix issue where notif wouldn't HUN" into qt-qpr1-dev am: 79300f15d7
am: cc8c9466f3

Change-Id: I68f33dbe98b327ab908a581d8be64c6199a7d13f