Merge "Removed TextAlign in TextView"