Refactor captcha handling into its own Handler

Change-Id: If25368484eed89ae8f00f203e0be7e23b640d779
Merge "Refactor captcha handling into its own Handler"