Backed out changeset dcec4c42cd18 (bug 757866) for bug 980835
Backed out changeset f94ee00aa4d6 (bug 974197) for causing gaia-ui-test failures
Merge mozilla-central and b2g-inbound