Merge "Use elapsed time as timestamp of activity launch" into sc-dev