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

* commit '3506d885b850a3d3e2c218f427ccc5dae6d205d7':
  Fix issue with notification layouts.