Merge "Adding ActivityInputHandler and tests." into nyc-andromeda-dev