Merge "Move RecoverySystemService into its own package"