Merge branch 'keyboard-indicator' into 'master'