Merge changes I210d4ae0,I7076b98f into main

* changes:
  Edit activity for hub mode
  Introduce BaseCommunalViewModel