Merge "Update SystemUI aconfig files to match new style" into main