Add keyboard features (From Slim)

Change-Id: Ib6225acedfd09ffb2d065b72406e476c33eec6a7