Bug 929315 - [HW test] geolocation needs permission
Bug 931723 - [HW test] multiactivities doesn't work
Bug 933571 - [HW test] iframe shows nothing in keyboard test
Bug 931729 - [HW test] async dual alert cause settimeout invalid
Merge pull request #13253 from RudyLu/Bug931200-add_croation_keyboard_master

Bug931200 - Add Croation keyboard layout +shepherd.
r=djf
Merge pull request #13275 from MBRSL/bug-931727-pathfix

bug - 931727 [HW test] update paths in UItest, r=gasolin
Merge pull request #13278 from MBRSL/bug-929315-geolocation

Bug 929315 - [HW test] geolocation needs permission, r=gasolin
Merge pull request #13255 from timdream/keyboard-perm-safenet

Bug 915570 - Rename 'keyboard' permission and role to 'input', r=rudyl
Merge pull request #13280 from MBRSL/bug-931723-multiactivities

Bug 931723 - [HW test] multiactivities doesn't work, r=gasolin
Merge pull request #13281 from MBRSL/bug-933571-keyboard

Bug 933571 - [HW test] iframe shows nothing in keyboard test, r=gasolin
Merge pull request #13282 from MBRSL/bug-931729-asyncAlert

Bug 931729 - [HW test] async dual alert cause settimeout invalid, r=gasolin
Bug 931719 - [HW test] unlock button in orientation test test doesn't work

Modified codes to switch-case so that js would not complain for missing buttons
Merge pull request #13163 from dwi2/bug907625

Bug 907625 - Prevent keyboard blocks incoming callscreen when keyboard i...,r=alive
Merge pull request #13279 from MBRSL/bug-931719-orientation

Bug 931719 - [HW test] unlock button in orientation test test doesn't work, r=gasolin
Bug 890225 - Made "Clear All" not visible when there are no notifications
Bug 912020 - Save to settings DB when leaving the panel
Bug 932250 - Write a test for context menu activity picker

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/apps/ui_tests/app.py
Merge pull request #13188 from AndreiH/bug932250

Bug 932250 - Write a test for context menu activity picker
Merge pull request #12863 from tomleese/bug890225

Bug 890225 - Made "Clear All" not visible when there are no notifications, r=timdream
Bug 919927 - [Permission] use permissions instead of permission/option/options