Merge "Clean up reflection-related services keep rules" into main