Merge "DO NOT MERGE Unregister notification listener before creating a new one to avoid duplicate Heads Up notifications." into qt-qpr1-dev am: a8422821ac

Change-Id: I3cd43a0543c1ef4ce3d525be9a7b047d247f1a18