Merge pull request #13255 from timdream/keyboard-perm-safenet

Bug 915570 - Rename 'keyboard' permission and role to 'input', r=rudyl