- Add fix for samsung devices calling an on-click when user never clicked (and thus variables are null)