Merge "Make KeybuttonView respect display id"