Merge "Prepare to clean up the drawing snapshot with aspect ratio mismatch" into main