Merge "Make override immediately override aconfigd" into main