Merge "Removing obsolete ScreenRecord annotations" into main