am 2d63144e: Merge "Fix issue #3380072: Switching in and out of gmail not preserving position in label" into honeycomb

* commit '2d63144ed94dff0832d051ec355f56649244dd4e':
  Fix issue #3380072: Switching in and out of gmail not preserving position in label