Merge "Add a runtime switch between Raster and Ganesh rendering modes."