Merge "The center aligned test has to have 1 pixel margin" into gingerbread