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