Merge "Refactor to fix java/kotlin issue affecting sysui-studo"