Sync changes with gecko-dev version.