Opened bug https://bugzilla.mozilla.org/show_bug.cgi?id=936889 and pull request https://github.com/mozilla-b2g/gaia/pull/13550 to fix this