Merge "Make notification-shade-collapse-after-dismiss behaviour configurable." into cm-10.1

Change-Id: I2a85117e862cab7621b22b8e5438e664aec0928c