Merge "Patches for the Paste window behavior." into honeycomb