Merge "Convert GridSizeMigrationLogic and DbEntry to Kotlin" into main