Merge "TouchLatency: make updates time based and add fps to ball mode" am: 1c548e5c79
am: a9ffd16b6e

Change-Id: Id5b7d0d92f438291b135d2bbc532d2439cd491f1