Merge "Using transformation method in the ImageFloatingTextView" into oc-dr1-dev