Merge "More Text related logging & clean-up" into tizen