Merge "Bug 3332414 - UI glitch in CAB options" into honeycomb