Merge "Prefer framework-annotations-lib dependency" into main