Merge "Improve notification shade collapse code." into cm-10.1

Change-Id: Ica10f5450d52f6d52379a9ea12357eb71491e4e7