Merge "Add container property to a couple more aconfig declarations" into main