Merge "Add tweaks to smooth out swipe to dismiss. am: 5758a9a9 am: ddc6e0b7" into nyc-mr2-dev-plus-aosp