Merge "Convert SpringLoadedDragController to Kotlin" into main