Merge commit '2714f8fa23d8ca44e98272baf885d12b5185d084' into viewport_164

# Conflicts:
#	imgui.cpp
#	imgui_widgets.cpp

imgui_widgets.cpp

@@ -2139,7 +2139,6 @@ bool ImGui::VSliderScalar(const char* label, const ImVec2& size, ImGuiDataType d
         g.ActiveIdAllowNavDirFlags = (1 << ImGuiDir_Left) | (1 << ImGuiDir_Right);
     }
 
-
     // Draw frame
     const ImU32 frame_col = GetColorU32(g.ActiveId == id ? ImGuiCol_FrameBgActive : g.HoveredId == id ? ImGuiCol_FrameBgHovered : ImGuiCol_FrameBg);
     RenderNavHighlight(frame_bb, id);