am ba6ae57f: Merge "Improved expansion logic of NotificationStackScroller"

* commit 'ba6ae57f64e09fd9240640b6a0dd538e5f349bf1':
  Improved expansion logic of NotificationStackScroller