Merge "Move expensive TextClock operations to onAttach"