Merge "Continue to @hide freeform decor caption APIs" into oc-dev