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

Change-Id: I252049cd012a3ea0b07ea85468d57c193178264b