Merge "fix att notification crash" into qt-qpr1-dev
am: 4439ffdd4b

Change-Id: I9b889297d82fc0ce113c6cf6b33c20239d3467f2