Merge "Use UPDATE_CURRENT pending intent in widget" into honeycomb