Merge "[DO NOT MERGE] Better timestamp for shutdown and startup events." into qt-qpr1-dev