Merge "Fix arguments order of KeyboardId constructor"