Move shield state into gestureShield instead of drawShield