Merge "Convert ShadeTouchHandlerTest to Kotlin" into main