Merge "Add aconfig flag for media refactor." into main