Merge "Refactor audio aconfig flags" into main