Merge changes from topic "xa-pub" into main

* changes:
  Hide mistakenly exposed public typedef annotations
  Make all typedefs SOURCE retention