Merge mozilla-beta to b2g37. a=merge