Merge "Update the layout of contextual card dismissal view"