Merge "Paste popup uses a disabled icon when there is nothing to paste." into honeycomb-mr1