Merge "Fix rendering bug with saveLayerAlpha/drawColor."