Merge "AwesomePlayer: Improve performance on high-fps clips" into klp-dev