Merge "Fixes TextView's includes." into tizen