Merge "Revert "Make override immediately override aconfigd"" into main