Fixed button highlighting when dragging #10917

Change-Id: I69ff2c5a987e26d5d065f7c5a7ac45f9d6fa289a