Merge "Introduce TextView attribute for control justification." into oc-dev