Remove listener we add, and don't crash on callback for disposed dialog.

Change-Id: Ia6a1bddd212cb28a0331469e8e87324346d02841