Remove the duplicate 'x' close button

Reviewer: Chezka Arevalo

Issue: GCP-8883