Merge "Fixed broken ImageFloatingTextViewTests" into oc-dev