Merge changes from topic "blackflash-main" into main

* changes:
  Reuse ClockViewFactory
  Cache affordances and selection picker side