Issue #21402 - iPad button click fix