Make the behavior of close button same as cancel button

Bug: 53255
Change-Id: If27a770c531d78538c70dd86199f1791b1171c2d