Merge "Fix VerificationActivity Intent"