Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb