am ae0c56c7: am 3506d885: Merge "Fix issue with notification layouts." into honeycomb

* commit 'ae0c56c7367130db02594501238b51d61841de61':
  Fix issue with notification layouts.