Sync with 2.3.2's sensor timestamp compensation