Merge "Remove non-functional hardware keyboard options." into lmp-dev