Merge "Rename setTextDir to setTextDirection" into mnc-dev