Merge branch 'master' of git://github.com/mozilla-b2g/gaia into mixin

Conflicts:
	tests/python/gaia-ui-tests/gaiatest/gaia_test.py
	tests/python/gaia-ui-tests/gaiatest/runtests.py
Bug 939226 - [Action Icons - Clock] Remove shadows from action icons
Merge pull request #13980 from pivanov/bug-939155

Bug 939155 - [Action Icons - Cost Control] Remove shadows from action icons
Bug 943591 - Add explicit wait into keyboard app object so implicit wait is not required r=Askeing
Bug 943595 - Add explicit wait to test_context_menu_picker.py r=Askeing
Bug 943598 - Add explicit wait to Persona frame in UI tests to remove dependency on implicit wait
Merge pull request #13983 from pivanov/bug-939226

Bug 939226 - [Action Icons - Clock] Remove shadows from action icons
Merge pull request #14077 from mcav/pop3-chunks

Bug 939374 - [email] POP3: Take smaller sync bites to avoid OOM errors. r=asuth
Bug 939377 - [Bluetooth] 1.3 Visual Refresh of Bluetooth Icons
Merge pull request #13982 from pivanov/bug-939219

Bug 939219 - [Action Icons - Music] Remove shadows from action icons
Bug 932331 - Mark the test as intermittent r=me
Bug 935904 - Mark the test as intermittent r=me
Bug 943176 - [Settings] Fix full line :active highlights.
Merge pull request #14032 from caseyyee/bug-943005

Bug 943005: [Browser] Update to light 1.3 header
Merge pull request #14093 from eeejay/bug-943176

Bug 943176 - [Settings] Fix full line :active highlights.
Bug 934531 - [Messages] The Visual Design is incorrect for the contact card r=schung

This changes how we render a contact in the Messages app.

* adjust to the latest visual specification for the contact header (not for the
  "not contact" header): light font variant, new padding
Merge pull request #14037 from timdream/keyboard-oop-reenable

Bug 942790 - Re-enable keyboard oop on master, r=rudyl
Bug 943229 - Add backward compatibility check for stk system message, 'icc-stkcommand'.
Merge pull request #14086 from zacc/bug943591

Bug 943591 - Add explicit wait into keyboard app object so implicit wait...
Bug 935917 - [Messages] When setting a message's body, we shouldn't try to parse it as HTML r=schung

https://bugzilla.mozilla.org/show_bug.cgi?id=935917

- rewrite the "insert" function for string inputs