Merge "Avoid overwriting TEXT with PLACEHOLDER_TEXT" into tizen