Merge "Removing unused keyboard handling code" into sc-dev