Merge "Fix GKI timers to take execution time into account"