Merge "Don't shift drawing offset by default." into main