DO NOT MERGE Unregister notification listener before creating a new one to avoid am: 71801c6ac1

Change-Id: I6bd8ff759c1367e446d7974ecd0d6f95993c1002