Merge "Update TextShaper APIs to address API council feedback"