Merge "Use aconfig flag enable_split_contextual" into main