Add stock keyboard again, so the user can choose

Change-Id: I0416b902c714968d6d5bdaa10ead7aaa549cfc4b