Merge "Change trace tag for text dorelayout" into devel/master