DateField popup doesn't close when popup button is clicked (#14857)

Change-Id: Ieb6ff2f072726fe8707d3cce61569dd623b13ebd