Merge "Enable $wgVectorUseIconWatch by default."