Left overs of Make notification-shade-collapse-after-dismiss behaviour configurable

Change-Id: I3f1f554a15df68ec8c5e65d3307736b76477fba9