Merge "[pm] fix NPE in PreferredComponent" into main