Merge "TouchLatency: make updates time based and add fps to ball mode"