Merge changes from topic "multiple-picture-listeners" into main

* changes:
  Add additional ActivePictureTracker test coverage and rename tests
  Support multiple active picture listeners
  Rename of ActivePictureUpdater to ActivePictureTracker