Merge "Revert "Define ueventd.rc.recovery"" into main