Merge "Fixing small issues with drag-to-dismiss window."