improve gesture anywhere close button

Change-Id: Idf9e78ad247b75b66147198070075fd1bd77e0d3