Merge "Fix problem where enter and space key do nothing on ListView."