ElevationDrag and CardViewSample fixes