Merge "EdgeExtension: add java-visible flag target" into main