Merge "Move RescueParty registration back to the beginning of SystemServer." into main