Merge "Fixed cross profile usage of TextClock." into nyc-dev