Merge "Move expensive TextClock operations to onAttach" into oc-dev