Merge "Revert "Break down jank between frame drops vs. triple buffered"" into pi-dev