Merge "Fix wrong Notification refactor" into qt-qpr1-dev
am: 9c743a222d

Change-Id: Ia329bece21b35d6379fbed7c72900ec7b0945131