Merge changes Iccb870b0,Ibea2dbe0 into main

* changes:
  Inject bubble controllers directly
  Allow injecting bubble controllers in taskbar test