Merge changes from topic "catalyst" into main

* changes:
  [Catalyst] Provide PreferenceScreenMetadata via creator
  [Catalyst] Introduce FixedArrayMap