Merge "Adjust contextual card dismissal view"