Merge "NotificationShade should animate away on MODE_UNLOCK_COLLAPSING" into sc-qpr1-dev