Merge "Add dynamic display id associations for keyboards" into sc-dev