[eekboard/f17: 3/3] Merge remote-tracking branch 'origin/master' into f17