Merge "Modify SwipeDismissLayout to perform its own exit animation" into cw-f-dev am: 3601d3c239
am: ca8412c316

Change-Id: I7b1eb7a617a5a0820cb4431daedbb9abf5b7777b