Merge mozilla/gecko-dev with imjalpreet/gecko-dev