Merge "audio: Fix the type used for timekeeping" into main