Solve directory path problem for custom keyboard
Merge remote-tracking branch 'origin/master'