Merge changes from topic "catalyst" into main

* changes:
  [Catalyst] Support hybrid mode screen test
  [Catalyst] Support hybrid mode