Merge "Prepare for @RequiresApi class retention" into main