Ensure that data manager is removed from the change tracker upon closing.

Change-Id: Ifaa6e65e95a0f595295c8f8be2ee4b3ea17fd6a1