Merge pull request #13410 from timdream/keyboard-rename-followup

Bug 935350 - Rename 'keyboard' role in homescreen, r=rudyl
(cherry picked from commit c367635134a18ba98e2f9267d0c70da7542239ba)

Conflicts:
	apps/homescreen/js/grid.js