Merge "Add new ITouchContextService interface to twoshay" into sc-dev