Merge changes from topic "catalyst" into main

* changes:
  [Catalyst] Fix PreferenceHierarchy add after/before
  [Catalyst] Allow specify order in hierarchy
  [Catalyst] Add PreferenceBindingFactory.bind