am 9512d6aa: Merge "Fix bug 3360954 - Text overlaid on menu icons" into honeycomb

* commit '9512d6aa206f8bb44ab52b6dfe5ee8cb5c2960ea':
  Fix bug 3360954 - Text overlaid on menu icons