NXP-13617: Dispose locally instantiated Controller at tear down
NXP-13617: Make sure local changes are taken into account by local scan