Merge pull request #20121 from timdream/keyboard-hide-lock

Bug 1018335 - removeFocus() when the screen is locked, r=rudyl
Conflicts:
	apps/system/js/keyboard_manager.js
	apps/system/test/unit/keyboard_manager_test.js