Fixes #7025, Fixes# 7025, Fixes # 7025 . Bug that I previously squashed
appeared again (Verification Scan Activity- Continue/Cancel buttons do
nothing)