Option to force keyboard to show enter key (2/2)

Change-Id: I34ecb6aa9461ae7b92ab433cbea6cc69b3751d27