Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev