Merge "Relax system_server keep rules" into main