Merge "Updated notification and effects for Honeycomb Bug: 3389139" into honeycomb