Elliminate flickering when calling mergeNewParams

Conflicts:
	lib/OpenLayers/Tile/Image.js