Fixed a regression with collapsed notification heights

This could lead to collapsed notifications having and intrinsic
height smaller than the collapsed size and notifications
overlapping.

Change-Id: Iabba19033f8069f1f75218280b97d3a1a45a5efb