Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev