Merge commit '7c1c4600' into eclair-mr2 * commit '7c1c4600': Fix 2261626: Don't show text on button if orientation is vertical.