Merge "Refactor timestamp for input events"