Merge "Set up to use aconfig flags from WM Shell" into main