Merge "Switch System.currentTimeMillis() to Event.getEventTime()" into tm-qpr-dev