Merge "Migrate battery usage DAO to Kotlin" into main