Sync back mozilla-central changes