Merge changes from topic "windowPrototype" into main

* changes:
  Fixing tests related to abstraction
  Abstracting StatefulActivity from StateManager