Fix tap in cards view test and repair false positive
Merge remote-tracking branch 'upstream/master' into cards_view_tap_fp
Merge pull request #275 from zacc/cards_view_tap_fp

Fix tap in cards view test and repair false positive