Merge changes I180f432e,Ie4766452 into main

* changes:
  Use a weakref hashmap to store controllers
  Always clean up taskview