Add willPrepareForDraw handling

Necessary for montage v0.12.3