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