firefox: merged updates from ::sardemff7-pending