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

Change-Id: Iba47e89125a57549b7fb315f09b15a3bd4a28819