Merge "Revert "Move expensive TextClock operations to onAttach""