Merge commit '17831dd428419686ec0e6da9b25fd593bdee7ac0' * commit '17831dd428419686ec0e6da9b25fd593bdee7ac0': Fix 2261626: Don't show text on button if orientation is vertical.
Merge commit '17831dd428419686ec0e6da9b25fd593bdee7ac0' * commit '17831dd428419686ec0e6da9b25fd593bdee7ac0': Fix 2261626: Don't show text on button if orientation is vertical.