Merge pull request #10293 from RudyLu/keyboard/Bug852785-hideKeyboard_before_show_activityMenu

Bug 852785 - Hide keyboard before activity menu shows. r=alive(cherry picked from commit bd07ce233160a0e6325bf736769772a9d2273458)

Conflicts:
	apps/system/js/keyboard_manager.js