Merge "Fix issue #2537384: Default keyboard input method switched on Eclaire to FRE77D upgrade"