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