More update upcoming in docking branch.
NO OTHER CHANGES. This WILL NOT compile with SDL3. This intermediate commit designed to make it easier to visualize the meaningful channges commit in the next commit.