Merge "Count app launch correctly." into pi-dev