Merge "Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D" into devel/master