Merge "Fix issue with notification layouts." into honeycomb