Merge "Delay the removal of support of ScriptC from TargetAPI 35 to 36" into main