Merge "Refine system service proguard rules" into main