Merge "Add OemExtension callbacks support" into main