Merge "Update the drag to dismiss UI to be closer to design"